Revert extra changes