#417 Reverted changes that I didn't want to commit.