This reverts commit 196013fc39, reversing changes made to 8b0c563832. Closes gh-28384 See gh-28241
196013fc39
8b0c563832