Revert "From Ed Lewis"

This reverts commit 5fb442215842638a9450e06ec438a67c1188a036.
From Ed Lewis, redux