remove hackish workaround that breaks valid behaviour now