Revert 4284 phase2 gem03

revert!!