Revert 5767c2e..4679a86

This rolls back to commit 5767c2ed7d189bc9d98ec04f0bdac4207861b1a8.
Revert "Revert 5767c2e..4679a86"

This reverts commit 0182cf298382c8adc8550273f08739f1c279c005.