Bug 870148 - Follow up, fix broken rebase. a=leo+