Short-term fix for #282.

First pass at fix for #282. This corresponds to the short term fix described in (2) of #282.

This does not break any compatibility. And can go in a bug release.

Long term fix described in (1) coming...