Rolled back changes

Accidentally committed on the wrong branch.