Revert two changes