Revert 9406038..adbe989

This rolls back to commit 9406038b141fbe392cf8768e9e71bfa2e2db59fe.
Testing