Revert last two commits