Rollback all the changes for 1.7 upgrading.