x86: remove additional vestiges of the zImage/bzImage split