* commit '545dd853bffbf778a0a44816ac6ed381b13f2158': Fix build breakage in older branches by avoiding <> notation