This reverts commit 81bc6bf34b262a0770e1f05357ceefe3f1b0d836, reversing
changes made to 7de736e8d0a12f9fd0a97ccd2dcb1cf769783d21.
Unfortunately this tricks the upgrade system into picking the wrong
binary. We need to fix the upgrade system before merging this.