Revert 4 unwanted commits