Back out revision c35458a437cc (bug 976305) for breaking DataStore tests. r=orange