Revert b4361c9..8d6f19e

This rolls back to commit b4361c9758354f5c3c78709a9921a90d19994e24.
Revert "Revert b4361c9..8d6f19e"

This reverts commit 5d6340a03ad986b82ffd4c2b2c4fbc846151c6bf.