Bug 1041836 - Backport.