Revert c6fb09f..ce956f9

This rolls back to commit c6fb09fecf2ea2035545cea9836ada6fd8e3e7a2.