backport r66656 so people using -Qnew aren't affected
1 file changed