Temporarily disabling some code from PLAT-3169