revert the expire related changes