RF-13863 - reverting changes