Revert 9ecf374..584b2e2

This rolls back to commit 9ecf3746c80b9e5b0db9405001852c4f1c4eb0a1.