Backed out changeset 89070599e2d6 This fix doesn't seem to work after all.  Fixing this properly has to wait until after the release.
Backed out changeset 89070599e2d6
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