Revert some changes that are no longer required.