Revert some unwanted modifications from the previous patch.