Revert 8391a28..8098451

This rolls back to commit 8391a28d62414535bfcfddf579636e417e34b2e8.