This reverts commit 1f6851bb53. It's no longer needed to use this workaround with the 9.20.5 release.
1f6851bb53