finanally clean up brcompat, since its remove from 1.10.0 in upstream.