Fix changeset dd9af1721ede: revert behavior to what it was before. Without changing the core of that change.
Fix changeset dd9af1721ede: revert behavior to what it was before.
Without changing the core of that change.

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