Dealing with node promote

From #4038.