Revert "Bug 980217 - Remove extra line leftover from rebasing. a=bustage"

This reverts commit 6ccd97a605e7f4ccad2fa92ac9575b35028e07a7.
Revert "Merge pull request #21515 from weigao123/Bug980217-master"

This reverts commit 041c794bdce3a81767d1c60e776227f5c4d42651.