[PLAT-5723] Reverting to 2.1 code (elaine)