Restoring vital code

...and putting it elsewhere in the file, in the hope of tricking git
into accepting it.