Revert 1b0d9e8..ecb905c

This rolls back to commit 1b0d9e898ec7b5ad55ea0e3467b60fa796f6f7d6.
Revert "Revert 1b0d9e8..ecb905c"

This reverts commit 43c182ca1b9736498a29a51e565462b6dc52d938.