Revert ae45e11..ef06937

This rolls back to commit ae45e11b71c8a111bb0438aecedc504cf9e5064f.
Revert "Revert ae45e11..ef06937"

This reverts commit e22057a2f0326d3e861bb40eb4547430ed14d7fc.