Back out 4d8015a52178 (bug 936566) for build bustage
Back out 4fd2bf2ec8db (bug 939662) for Windows build bustage
CLOSED TREE