[JBJCA-1189] Revert XidWrapper change, but add pad guard