Bug 989147 - Add missing part of the patch from rebase conflict. r=gps