Remove changes that were accidently included in previous commit.