Revert c374a29..2c0d722

This rolls back to commit c374a29a26ca4a21920b335cd73d9af16642eb70.