Bug 17261: (followup) Rebase against 17189 and 11921