Revert my too-hasty commit.