This mitigates problem by making intention explicit.
Merge pull request #1206 from Gozala/bug/strict-wanings@905516

Bug 905516 - This mitigates problem by making intention explicit. r=@erikvold