[PLAT-4227] Revert change