This is no longer necessary, as this issue doesn't happen with Orca 47 anymore.
This reverts commit 82b15c37.
See #2544