am dcba2081: (-s ours) Fix 4081795: Blue glow gone wild. DO NOT MERGE

* commit 'dcba2081c6f39a6d334e26caafc783b36b34a95a':
  Fix 4081795: Blue glow gone wild. DO NOT MERGE