Bug 1053170 - Backed out skip commit 883d259a0ef1 due to fix