TBD: This can probably be unconditional but I put it into crossAttrs to avoid a rebuild of native stuff.