Revert c0c8a89..bfc49c8

This rolls back to commit c0c8a895752dcdb2d3778c428c5017486074e6c2.