Revert c6e6294..12e7835

This rolls back to commit c6e62943caf93adcb25c4f12aeb1a7271a5589a3.