Revert c8060b0..fc76f0c

This rolls back to commit c8060b04dc0bf37fbea418fc58c90758f1e60731.