Builds fine without it. PR: 240977 Approved by: linimon (mentor), portmgr (removing architecture-specific workarounds)