Back out 712758b52e76 (Bug 925621) for build bustage. r=backout