Revert "reverted one more change"

This reverts commit 3027e0ca15cf1c5f6246b07ca3595fa774a94999.