Revert "Roll back."

This reverts commit 999480c0cfeaccf728967d279a603a7f09fd289a.