This reverts commit 7f1c5184. BUG: 460809 CCBUG: 402376 FIXED-IN: 5.26.2
mentioned in commit 56e25daf