Revert 799ca88..573a7e6

This rolls back to commit 799ca882de7bf150797c6a2378857822140ee32e.
Revert "Revert 799ca88..573a7e6"

This reverts commit b1f405e15479a5b647d04bbd1266d2dac1e6fb46.