This technically should involve a catversion bump, but that seems
pedantic, so I skipped it.

Report and patch by David Christensen.