Move things round for 1.7