Revert b24a55d..ec0f8c5

This rolls back to commit b24a55ddb2a6748785441514dcd7b60a518020f0.
Revert "Revert b24a55d..ec0f8c5"

This reverts commit 51233450de285fc61b8571ff83c42820cd2f59ac.