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

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