Merge "Revert "Make platform_compat discoverable everywhere""