Revert c022610..84afe65

This rolls back to commit c022610f399041c37d631c7775c3a0f67a4ed257.