remove hack since wkb.ug/112869 is resolved!