Revert OTG chnages from Grouper