keep new compat layer out of rc7