Back out c4bb900163fc (part 3 of bug 1009733) for breaking windows builds. r=backout on a CLOSED TREE