[ros-diffs] [rharabien] 52235: [FREELDR] - Revert 52230 - it breaks freeldr build in GCC