Revert 2a4fb24..bdf5695

This rolls back to commit 2a4fb246c35a4f1615d5f50446197b560cea3b32.
Revert "Revert 2a4fb24..bdf5695"

This reverts commit 5a89b4b6f72c9081685f523938521e3ef2b4438d.