Fix merged to trunk via check-in [f154173793f81c6f].