Revert "Switch internal format for numbers to all brace groups"

This reverts commit 8a23ae6f120e7c451ea9676b2995f5ce5bb382b1.