@jrochkind this is the best that @cbeer and I could do without affecting backwards compatibility. We have a real issue and this patch fixes our issue.  If you come up with something better, please submit a PR.