RT#87124 fixed, workaround no longer necessary
Release v0.08270