revert last two commits