Revert c047ad7..9c4f3f4

This rolls back to commit c047ad7a14fda74b54a53b581dd7c064a3c31877.