remove unneeded workaround