Revert last couple of commits