Revert to upstream to see if #1932616 is still a problem.