Revert ca7ee93..9582464

This rolls back to commit ca7ee93c569be2bfdb8e91109cec42c343680c9d.
Revert "Revert ca7ee93..9582464"

This reverts commit f92ceb3fb48d43f98cc9f4b97efa571d3af30318.