Revert 5583277..d272eeb

This rolls back to commit 5583277f9f00e9578f261aaa7242daa9e56f60d4.
Revert "Revert 5583277..d272eeb"

This reverts commit c48e671eedefc8182735cad419ef2d0df2b0d5b4.