Revert 4019064..452fe39

This rolls back to commit 40190645f3ec734f3a3e2e0aef8eff4f01ace9ac.
failfail