am f681058f: Merge "Narrow previous fix for this issue." into klp-dev

* commit 'f681058f2dc08ebfbde93f30b160d5d53f104c99':
  Narrow previous fix for this issue.