Backed out a40244b87c7a (bug 845907)