Revert "Revert change again."

This reverts commit 8309794384e0ff26ff283613a83db9a0f5662404.