Bug 1013432 - Followup to fix rebase error. r=me