This workaround was added awhile back, but failing to invoke one of the function kept it from ever getting triggered.
A few quick tests appear to show that it works.