revert two small changes