[ORB-9] reverted previous commit