Revert b292524..6adc8f1

This rolls back to commit b29252444d9799aab3e81aefed55877422cef9b6.
Revert "Revert b292524..6adc8f1"

This reverts commit 923c73995ddfdb8434d46c6f71e5302cb3a04f80.