revert all 4.7 stuff for now