Revert 05d4351..b8736ce

This rolls back to commit 05d435160012459b130c4331d60e267af9bd2d15.