Revert c281082..5e93b56

This rolls back to commit c281082a316d2f9adc036aed4db75458b811fd43.