Revert some bogus changes in f38754d0d67c68eabf30f59b5dd983675cf50315. Not sure where these changes came from.