CFY-768 remove workaround