Revert 794f270..aa47bcd

This rolls back to commit 794f2709942bd220ecd86da340523dda2f401740.
Revert "Revert 794f270..aa47bcd"

This reverts commit 12b892f8c2c416d3a337ca722793a69068755b27.