Revert "#10591 change from customer"

This reverts commit ff6398e4abcffd3850b72f6752490ff4af7c8d49.
Revert "Revert "#10591 change from customer""

This reverts commit 7c5c2428575282d4d8178b824814a01e85f9e8ee.