Revert last few commits