Revert 6bc5fe8..3aef8ba

This rolls back to commit 6bc5fe87eac1f462fccf465f5cea54390a49b5f2.
Revert "Revert 6bc5fe8..3aef8ba"

This reverts commit 8e095cd4debf14f3083ae61a12cff5563508bd15.