S57444: replace some code that got deleted during the merge from master