Backed out changeset 91d280c835b2 (bug 1013771) for b2g osx build bustage