Revert some of ReSharpers overzealous changes.