Backed out changeset e449addcdf75 (bug 1062323) for gaia-unit test failures in compose_test.js