Torture suite: Revert some changes because they aren't necessary