Revert a363542..42530a3

This rolls back to commit a363542b02dac1deb4c6892fa2d2ef50ae50a0b2.