Fix for mistake in earlier merge of upstream/master with conflicts