Bug 1063653 landing. r=bhackett