Restore SmartCompletionPriorityWeigher lost in merge