revert two previous commits