Revert e89dae9..e37a235

This rolls back to commit e89dae9430574e011c6ac80cbbffcde9bf8c5518.