Revert two little changes