Removed cruft left behind by "refactoring" commit.