am d3d9897d: Fixes #1841298.

Merge commit 'd3d9897d4122e0eb6ab371b7ed4f11c3fd05df44'

* commit 'd3d9897d4122e0eb6ab371b7ed4f11c3fd05df44':
  Fixes #1841298.