Get rid of 1.4.7 only fixes