--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -78,23 +78,22 @@ js::GetLengthProperty(JSContext* cx, Han
             return true;
         }
     }
 
     RootedValue value(cx);
     if (!GetProperty(cx, obj, obj, cx->names().length, &value))
         return false;
 
-    bool overflow;
-    if (!ToLengthClamped(cx, value, lengthp, &overflow)) {
-        if (!overflow)
-            return false;
-        *lengthp = UINT32_MAX;
+    if (value.isInt32()) {
+        *lengthp = uint32_t(value.toInt32()); // uint32_t cast does ToUint32
+        return true;
     }
-    return true;
+
+    return ToUint32(cx, value, lengthp);
 }
 
 /*
  * Determine if the id represents an array index.
  *
  * An id is an array index according to ECMA by (15.4):
  *
  * "Array objects give special treatment to a certain class of property names.

--- a/js/src/tests/ecma_5/Array/unshift-01.js
+++ b/js/src/tests/ecma_5/Array/unshift-01.js
@@ -8,38 +8,34 @@ var BUGNUMBER = 614070;
 var summary = 'Array.prototype.unshift without args';
 
 print(BUGNUMBER + ": " + summary);
 
 /**************
  * BEGIN TEST *
  **************/
 
-// ES6 ToLength clamps length values to 2^53 - 1.
-// We currently clamp to 2^32 - 1 instead. See bug 924058.
-var MAX_LENGTH = 0xffffffff;
-
 var a = {};
-a.length = MAX_LENGTH + 1;
-assertEq([].unshift.call(a), MAX_LENGTH);
-assertEq(a.length, MAX_LENGTH);
+a.length = 4294967296;
+assertEq([].unshift.call(a), 0);
+assertEq(a.length, 0);
 
 function testGetSet(len, expected) {
     var newlen;
     var a = { get length() { return len; }, set length(v) { newlen = v; } };
     var res = [].unshift.call(a);
     assertEq(res, expected);
     assertEq(newlen, expected);
 }
 
 testGetSet(0, 0);
 testGetSet(10, 10);
 testGetSet("1", 1);
 testGetSet(null, 0);
-testGetSet(MAX_LENGTH + 2, MAX_LENGTH);
-testGetSet(-5, 0);
+testGetSet(4294967297, 1);
+testGetSet(-5, 4294967291);
 
 /******************************************************************************/
 
 if (typeof reportCompare === "function")
   reportCompare(true, true);
 
 print("All tests passed!");