Revert c09bff7..6ccefff

This rolls back to commit c09bff75b0de9a64b17bb6a0c6946a41eaced58b.