Fix bvt blocker

Don't merge this until we've tested it on trunk-ring3!