Bug 1069063 - Part 2: follow-up to include changes in v2 of the patch. r=me

--HG--
extra : rebase_source : 6d79233c7dab7af574c6f86c4bcae4770baac745