Whops, unbreak compilation from a clean tree