[PLAT-5012] Making backwards-compatible