Bug 11299: (follow-up) Rebase on recent changes