Back out 529526e6e659 (bug 868556) for b2g reftest-1 bustage