The workaround has been moved into the underlying C++ code. This reverts commit e4340667e3.
e4340667e3