Bug 948777 follow-up: the rest of the patch