Revert 1 and 2