Removed stuff that accidentally slipped into the last commit.