Cleaner version of previous commit.