We are trying to put a similar fix in our runtime to avoid you from having to do this workaround in 6.7. But in the meantime, this is the best thing to do.