Revert e5437ea..3559c84

This rolls back to commit e5437ea4d081c1c8416b98ee15a23656742ccee7.