Revert fc25e03..8ae5a79

This rolls back to commit fc25e03764f5b6f50a788bca5fe2900f2f079603.
Revert "Revert fc25e03..8ae5a79"

This reverts commit 0fca1316e8cfd9bffbb7d836fddeb62e23fe53ba.