Back out 34169163c4f3:8ca46c86c440 (bug 853423) for leaks