backout of  57624:14773b9be19b, also on Jul2015 branch
backout of  57624:14773b9be19b, also on Jul2015 branch

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