Fix failing build after what should have been a simple re-arrange of the imports