remove old workaround