[PLAT-5023] Temp fix to get a working build