908510 - Corrected imports to use compat layer

Not much to say, with our various platforms it's safer to use our compat layer for getting this import.