am 476f5525: Small fix to 5008973 fix.

* commit '476f55253adc670d7290ad8c90b5adc9e4f58d3b':
  Small fix to 5008973 fix.