Made a mistake in the patch for #3618, landing fix.