revert some rev3 changes for rev2