Revert previous commit (262727) and bounce patch back to the
submitter.

Pointed out by: jhb