Revert the last 2 changes