[BISERVER-10656] Reverting subfloor changes