Revert fd9b779..1fe173c

This rolls back to commit fd9b779e6229f102ebe29b4ccdd5b3a6d7504463.
Revert "Revert fd9b779..1fe173c"

This reverts commit e8f5b6ff75ba1ed0744c9fbd996b5e9425d8460d.