Backing out 8dc381124409 (bug 1056459) for apparently causing crashes in B2G-on-OS-X "Gip" test runs.