Revert e4668ce..9346b3b

This rolls back to commit e4668cedccdf916b4079a03c5236381ede4e8b12.
Revert "Revert e4668ce..9346b3b"

This reverts commit 72b75ed6eae9c0ce4f04a37dbd12a281aa0fe341.