rolling back the hybrid changes

Change-Id: I822827fc29fd75fde22a0264054673fad76a73f7