Revert a1b3e03..6145fd4

This rolls back to commit a1b3e032e7fd4304d5ee558e9ff7bdd49f30f5f4.
Revert "Revert a1b3e03..6145fd4"

This reverts commit e7049dafed58853a6570a87e6aa9ebfc37bddc79.