Merge "Revert "Remove strict mode violation with number formatting.""