Attempting to revert 7e96356dcf