Back out ecac2ce4eada (bug 828126) for busting b2g's arm