Revert "Update for #663399Becca"

This reverts commit 245b53ce178bb8109cc5455d119407f887b9a048.