(#4486)  Commit the fix again, with more feeling.