Revert 4933908..1e7eb67

This rolls back to commit 49339088fa2b8bcc40fa280ecf579a5f23de252a.
Javascript int range error