[PLAT-5696] Revert fix