Revert c963224..5676f46

This rolls back to commit c9632243c368bd5557a0fdc068e9cd8a9457d2a5.