Suggested workaround for #6263

This is our current workaround for #6263.  Usual disclaimer: it works for our use cases but might not for yours.