* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4': Fix build breakage in older branches by avoiding <> notation