Revert e35c394..d4dcad9

This rolls back to commit e35c3940dd30f7a8ad1012545ee317a1d6eee33f.
Revert "Revert e35c394..d4dcad9"

This reverts commit 1e249e4b3cefec6adc36339663ed55dd2021e179.