Revert last couple commits