One more change upstream