Revert two changes from last commit