Forward-port bug60 fix to 4.2 branch.