Revert 0808a56..dfc5aa8

This rolls back to commit 0808a5638ef6055a3e44c180d2dd582b62e2efa0.