Back out b2316c5a1d69 (bug 915233) for Win b2g desktop build bustage