[s2054] Fix backport mistake