am 8da09998: Fix regression.

Merge commit '8da09998160b25ee7fa0e96333872360c63bf95a'

* commit '8da09998160b25ee7fa0e96333872360c63bf95a':
  Fix regression.