restoring ios7 fix for non-primitive numbers
restoring ios7 fix for non-primitive numbers


Former-commit-id: 0e515b5da9d8877d8c75520f3e228b1a48eb8254 [formerly ce28642195d314d22e1d0c7a7d78a0521008b9bc]
Former-commit-id: 97a2eb8d514fc2b2fb955a5bd4489db46b4b0a00
romancow/Sugar,romancow/Sugar,andrewplummer/Sugar,andrewplummer/Sugar