Backed out changeset e3577bc93042 This fix doesn't seem to work after all.  Fixing this properly has to wait until after the release.
Backed out changeset e3577bc93042
This fix doesn't seem to work after all.  Fixing this properly has to
wait until after the release.

zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb