I don't think we need these, and they haven't been doing anything
useful for dynamic-by-default builds anyway as they hardcode the 'v'
way.