Revert 6f664ef..d3d3839

This rolls back to commit 6f664ef7df345b70b056b8440865dc47203fddd2.
It lives!