remove workaround flag