This reverts commit 3b2a4da023, reversing changes made to 181b68088a. See gh-32876
3b2a4da023
181b68088a