diff --git a/ext/standard/tests/strings/bug54055.phpt b/ext/standard/tests/strings/bug54055.phpt
index 25d3feb0302..4ef2f7d4ed9 100644
--- a/ext/standard/tests/strings/bug54055.phpt
+++ b/ext/standard/tests/strings/bug54055.phpt
@@ -14,577 +14,577 @@ for($i = 495; $i <= 1074; $i++) {
 498: len=505
 499: len=506
 500: len=507
-501: len=507
-502: len=507
-503: len=507
-504: len=507
-505: len=507
-506: len=507
-507: len=507
-508: len=507
-509: len=507
-510: len=507
-511: len=507
-512: len=507
-513: len=507
-514: len=507
-515: len=507
-516: len=507
-517: len=507
-518: len=507
-519: len=507
-520: len=507
-521: len=507
-522: len=507
-523: len=507
-524: len=507
-525: len=507
-526: len=507
-527: len=507
-528: len=507
-529: len=507
-530: len=507
-531: len=507
-532: len=507
-533: len=507
-534: len=507
-535: len=507
-536: len=507
-537: len=507
-538: len=507
-539: len=507
-540: len=507
-541: len=507
-542: len=507
-543: len=507
-544: len=507
-545: len=507
-546: len=507
-547: len=507
-548: len=507
-549: len=507
-550: len=507
-551: len=507
-552: len=507
-553: len=507
-554: len=507
-555: len=507
-556: len=507
-557: len=507
-558: len=507
-559: len=507
-560: len=507
-561: len=507
-562: len=507
-563: len=507
-564: len=507
-565: len=507
-566: len=507
-567: len=507
-568: len=507
-569: len=507
-570: len=507
-571: len=507
-572: len=507
-573: len=507
-574: len=507
-575: len=507
-576: len=507
-577: len=507
-578: len=507
-579: len=507
-580: len=507
-581: len=507
-582: len=507
-583: len=507
-584: len=507
-585: len=507
-586: len=507
-587: len=507
-588: len=507
-589: len=507
-590: len=507
-591: len=507
-592: len=507
-593: len=507
-594: len=507
-595: len=507
-596: len=507
-597: len=507
-598: len=507
-599: len=507
-600: len=507
-601: len=507
-602: len=507
-603: len=507
-604: len=507
-605: len=507
-606: len=507
-607: len=507
-608: len=507
-609: len=507
-610: len=507
-611: len=507
-612: len=507
-613: len=507
-614: len=507
-615: len=507
-616: len=507
-617: len=507
-618: len=507
-619: len=507
-620: len=507
-621: len=507
-622: len=507
-623: len=507
-624: len=507
-625: len=507
-626: len=507
-627: len=507
-628: len=507
-629: len=507
-630: len=507
-631: len=507
-632: len=507
-633: len=507
-634: len=507
-635: len=507
-636: len=507
-637: len=507
-638: len=507
-639: len=507
-640: len=507
-641: len=507
-642: len=507
-643: len=507
-644: len=507
-645: len=507
-646: len=507
-647: len=507
-648: len=507
-649: len=507
-650: len=507
-651: len=507
-652: len=507
-653: len=507
-654: len=507
-655: len=507
-656: len=507
-657: len=507
-658: len=507
-659: len=507
-660: len=507
-661: len=507
-662: len=507
-663: len=507
-664: len=507
-665: len=507
-666: len=507
-667: len=507
-668: len=507
-669: len=507
-670: len=507
-671: len=507
-672: len=507
-673: len=507
-674: len=507
-675: len=507
-676: len=507
-677: len=507
-678: len=507
-679: len=507
-680: len=507
-681: len=507
-682: len=507
-683: len=507
-684: len=507
-685: len=507
-686: len=507
-687: len=507
-688: len=507
-689: len=507
-690: len=507
-691: len=507
-692: len=507
-693: len=507
-694: len=507
-695: len=507
-696: len=507
-697: len=507
-698: len=507
-699: len=507
-700: len=507
-701: len=507
-702: len=507
-703: len=507
-704: len=507
-705: len=507
-706: len=507
-707: len=507
-708: len=507
-709: len=507
-710: len=507
-711: len=507
-712: len=507
-713: len=507
-714: len=507
-715: len=507
-716: len=507
-717: len=507
-718: len=507
-719: len=507
-720: len=507
-721: len=507
-722: len=507
-723: len=507
-724: len=507
-725: len=507
-726: len=507
-727: len=507
-728: len=507
-729: len=507
-730: len=507
-731: len=507
-732: len=507
-733: len=507
-734: len=507
-735: len=507
-736: len=507
-737: len=507
-738: len=507
-739: len=507
-740: len=507
-741: len=507
-742: len=507
-743: len=507
-744: len=507
-745: len=507
-746: len=507
-747: len=507
-748: len=507
-749: len=507
-750: len=507
-751: len=507
-752: len=507
-753: len=507
-754: len=507
-755: len=507
-756: len=507
-757: len=507
-758: len=507
-759: len=507
-760: len=507
-761: len=507
-762: len=507
-763: len=507
-764: len=507
-765: len=507
-766: len=507
-767: len=507
-768: len=507
-769: len=507
-770: len=507
-771: len=507
-772: len=507
-773: len=507
-774: len=507
-775: len=507
-776: len=507
-777: len=507
-778: len=507
-779: len=507
-780: len=507
-781: len=507
-782: len=507
-783: len=507
-784: len=507
-785: len=507
-786: len=507
-787: len=507
-788: len=507
-789: len=507
-790: len=507
-791: len=507
-792: len=507
-793: len=507
-794: len=507
-795: len=507
-796: len=507
-797: len=507
-798: len=507
-799: len=507
-800: len=507
-801: len=507
-802: len=507
-803: len=507
-804: len=507
-805: len=507
-806: len=507
-807: len=507
-808: len=507
-809: len=507
-810: len=507
-811: len=507
-812: len=507
-813: len=507
-814: len=507
-815: len=507
-816: len=507
-817: len=507
-818: len=507
-819: len=507
-820: len=507
-821: len=507
-822: len=507
-823: len=507
-824: len=507
-825: len=507
-826: len=507
-827: len=507
-828: len=507
-829: len=507
-830: len=507
-831: len=507
-832: len=507
-833: len=507
-834: len=507
-835: len=507
-836: len=507
-837: len=507
-838: len=507
-839: len=507
-840: len=507
-841: len=507
-842: len=507
-843: len=507
-844: len=507
-845: len=507
-846: len=507
-847: len=507
-848: len=507
-849: len=507
-850: len=507
-851: len=507
-852: len=507
-853: len=507
-854: len=507
-855: len=507
-856: len=507
-857: len=507
-858: len=507
-859: len=507
-860: len=507
-861: len=507
-862: len=507
-863: len=507
-864: len=507
-865: len=507
-866: len=507
-867: len=507
-868: len=507
-869: len=507
-870: len=507
-871: len=507
-872: len=507
-873: len=507
-874: len=507
-875: len=507
-876: len=507
-877: len=507
-878: len=507
-879: len=507
-880: len=507
-881: len=507
-882: len=507
-883: len=507
-884: len=507
-885: len=507
-886: len=507
-887: len=507
-888: len=507
-889: len=507
-890: len=507
-891: len=507
-892: len=507
-893: len=507
-894: len=507
-895: len=507
-896: len=507
-897: len=507
-898: len=507
-899: len=507
-900: len=507
-901: len=507
-902: len=507
-903: len=507
-904: len=507
-905: len=507
-906: len=507
-907: len=507
-908: len=507
-909: len=507
-910: len=507
-911: len=507
-912: len=507
-913: len=507
-914: len=507
-915: len=507
-916: len=507
-917: len=507
-918: len=507
-919: len=507
-920: len=507
-921: len=507
-922: len=507
-923: len=507
-924: len=507
-925: len=507
-926: len=507
-927: len=507
-928: len=507
-929: len=507
-930: len=507
-931: len=507
-932: len=507
-933: len=507
-934: len=507
-935: len=507
-936: len=507
-937: len=507
-938: len=507
-939: len=507
-940: len=507
-941: len=507
-942: len=507
-943: len=507
-944: len=507
-945: len=507
-946: len=507
-947: len=507
-948: len=507
-949: len=507
-950: len=507
-951: len=507
-952: len=507
-953: len=507
-954: len=507
-955: len=507
-956: len=507
-957: len=507
-958: len=507
-959: len=507
-960: len=507
-961: len=507
-962: len=507
-963: len=507
-964: len=507
-965: len=507
-966: len=507
-967: len=507
-968: len=507
-969: len=507
-970: len=507
-971: len=507
-972: len=507
-973: len=507
-974: len=507
-975: len=507
-976: len=507
-977: len=507
-978: len=507
-979: len=507
-980: len=507
-981: len=507
-982: len=507
-983: len=507
-984: len=507
-985: len=507
-986: len=507
-987: len=507
-988: len=507
-989: len=507
-990: len=507
-991: len=507
-992: len=507
-993: len=507
-994: len=507
-995: len=507
-996: len=507
-997: len=507
-998: len=507
-999: len=507
-1000: len=507
-1001: len=507
-1002: len=507
-1003: len=507
-1004: len=507
-1005: len=507
-1006: len=507
-1007: len=507
-1008: len=507
-1009: len=507
-1010: len=507
-1011: len=507
-1012: len=507
-1013: len=507
-1014: len=507
-1015: len=507
-1016: len=507
-1017: len=507
-1018: len=507
-1019: len=507
-1020: len=507
-1021: len=507
-1022: len=507
-1023: len=507
-1024: len=507
-1025: len=507
-1026: len=507
-1027: len=507
-1028: len=507
-1029: len=507
-1030: len=507
-1031: len=507
-1032: len=507
-1033: len=507
-1034: len=507
-1035: len=507
-1036: len=507
-1037: len=507
-1038: len=507
-1039: len=507
-1040: len=507
-1041: len=507
-1042: len=507
-1043: len=507
-1044: len=507
-1045: len=507
-1046: len=507
-1047: len=507
-1048: len=507
-1049: len=507
-1050: len=507
-1051: len=507
-1052: len=507
-1053: len=507
-1054: len=507
-1055: len=507
-1056: len=507
-1057: len=507
-1058: len=507
-1059: len=507
-1060: len=507
-1061: len=507
-1062: len=507
-1063: len=507
-1064: len=507
-1065: len=507
-1066: len=507
-1067: len=507
-1068: len=507
-1069: len=507
-1070: len=507
-1071: len=507
-1072: len=507
-1073: len=507
-1074: len=507
+501: len=508
+502: len=509
+503: len=510
+504: len=511
+505: len=512
+506: len=513
+507: len=514
+508: len=515
+509: len=516
+510: len=517
+511: len=517
+512: len=519
+513: len=520
+514: len=521
+515: len=521
+516: len=523
+517: len=524
+518: len=525
+519: len=526
+520: len=527
+521: len=528
+522: len=529
+523: len=529
+524: len=531
+525: len=532
+526: len=532
+527: len=534
+528: len=535
+529: len=536
+530: len=537
+531: len=538
+532: len=539
+533: len=540
+534: len=541
+535: len=542
+536: len=543
+537: len=544
+538: len=545
+539: len=546
+540: len=547
+541: len=548
+542: len=549
+543: len=550
+544: len=551
+545: len=552
+546: len=553
+547: len=554
+548: len=555
+549: len=555
+550: len=557
+551: len=557
+552: len=559
+553: len=560
+554: len=561
+555: len=562
+556: len=563
+557: len=564
+558: len=565
+559: len=566
+560: len=567
+561: len=568
+562: len=569
+563: len=570
+564: len=571
+565: len=572
+566: len=573
+567: len=574
+568: len=575
+569: len=576
+570: len=577
+571: len=578
+572: len=579
+573: len=580
+574: len=581
+575: len=582
+576: len=583
+577: len=584
+578: len=585
+579: len=586
+580: len=587
+581: len=588
+582: len=589
+583: len=590
+584: len=591
+585: len=591
+586: len=593
+587: len=594
+588: len=595
+589: len=596
+590: len=597
+591: len=598
+592: len=598
+593: len=600
+594: len=600
+595: len=600
+596: len=603
+597: len=604
+598: len=605
+599: len=606
+600: len=607
+601: len=608
+602: len=608
+603: len=610
+604: len=611
+605: len=611
+606: len=613
+607: len=614
+608: len=615
+609: len=616
+610: len=617
+611: len=618
+612: len=619
+613: len=620
+614: len=621
+615: len=622
+616: len=623
+617: len=624
+618: len=625
+619: len=626
+620: len=627
+621: len=628
+622: len=629
+623: len=630
+624: len=631
+625: len=632
+626: len=633
+627: len=633
+628: len=635
+629: len=636
+630: len=637
+631: len=638
+632: len=639
+633: len=639
+634: len=641
+635: len=642
+636: len=643
+637: len=644
+638: len=645
+639: len=645
+640: len=647
+641: len=648
+642: len=649
+643: len=650
+644: len=650
+645: len=652
+646: len=653
+647: len=654
+648: len=655
+649: len=656
+650: len=657
+651: len=658
+652: len=659
+653: len=660
+654: len=661
+655: len=662
+656: len=663
+657: len=664
+658: len=665
+659: len=665
+660: len=667
+661: len=668
+662: len=669
+663: len=670
+664: len=671
+665: len=672
+666: len=673
+667: len=673
+668: len=675
+669: len=676
+670: len=677
+671: len=678
+672: len=678
+673: len=680
+674: len=680
+675: len=682
+676: len=683
+677: len=684
+678: len=685
+679: len=686
+680: len=687
+681: len=688
+682: len=688
+683: len=690
+684: len=691
+685: len=692
+686: len=693
+687: len=694
+688: len=695
+689: len=696
+690: len=697
+691: len=698
+692: len=699
+693: len=699
+694: len=701
+695: len=702
+696: len=703
+697: len=704
+698: len=705
+699: len=706
+700: len=706
+701: len=708
+702: len=709
+703: len=710
+704: len=711
+705: len=712
+706: len=713
+707: len=714
+708: len=715
+709: len=716
+710: len=717
+711: len=718
+712: len=719
+713: len=720
+714: len=721
+715: len=722
+716: len=723
+717: len=724
+718: len=725
+719: len=726
+720: len=727
+721: len=728
+722: len=729
+723: len=730
+724: len=731
+725: len=732
+726: len=733
+727: len=734
+728: len=735
+729: len=736
+730: len=737
+731: len=738
+732: len=739
+733: len=739
+734: len=741
+735: len=742
+736: len=743
+737: len=744
+738: len=745
+739: len=746
+740: len=747
+741: len=748
+742: len=749
+743: len=750
+744: len=751
+745: len=752
+746: len=753
+747: len=754
+748: len=755
+749: len=756
+750: len=757
+751: len=758
+752: len=758
+753: len=758
+754: len=758
+755: len=758
+756: len=758
+757: len=758
+758: len=758
+759: len=758
+760: len=758
+761: len=758
+762: len=758
+763: len=758
+764: len=758
+765: len=758
+766: len=758
+767: len=758
+768: len=758
+769: len=758
+770: len=758
+771: len=758
+772: len=758
+773: len=758
+774: len=758
+775: len=758
+776: len=758
+777: len=758
+778: len=758
+779: len=758
+780: len=758
+781: len=758
+782: len=758
+783: len=758
+784: len=758
+785: len=758
+786: len=758
+787: len=758
+788: len=758
+789: len=758
+790: len=758
+791: len=758
+792: len=758
+793: len=758
+794: len=758
+795: len=758
+796: len=758
+797: len=758
+798: len=758
+799: len=758
+800: len=758
+801: len=758
+802: len=758
+803: len=758
+804: len=758
+805: len=758
+806: len=758
+807: len=758
+808: len=758
+809: len=758
+810: len=758
+811: len=758
+812: len=758
+813: len=758
+814: len=758
+815: len=758
+816: len=758
+817: len=758
+818: len=758
+819: len=758
+820: len=758
+821: len=758
+822: len=758
+823: len=758
+824: len=758
+825: len=758
+826: len=758
+827: len=758
+828: len=758
+829: len=758
+830: len=758
+831: len=758
+832: len=758
+833: len=758
+834: len=758
+835: len=758
+836: len=758
+837: len=758
+838: len=758
+839: len=758
+840: len=758
+841: len=758
+842: len=758
+843: len=758
+844: len=758
+845: len=758
+846: len=758
+847: len=758
+848: len=758
+849: len=758
+850: len=758
+851: len=758
+852: len=758
+853: len=758
+854: len=758
+855: len=758
+856: len=758
+857: len=758
+858: len=758
+859: len=758
+860: len=758
+861: len=758
+862: len=758
+863: len=758
+864: len=758
+865: len=758
+866: len=758
+867: len=758
+868: len=758
+869: len=758
+870: len=758
+871: len=758
+872: len=758
+873: len=758
+874: len=758
+875: len=758
+876: len=758
+877: len=758
+878: len=758
+879: len=758
+880: len=758
+881: len=758
+882: len=758
+883: len=758
+884: len=758
+885: len=758
+886: len=758
+887: len=758
+888: len=758
+889: len=758
+890: len=758
+891: len=758
+892: len=758
+893: len=758
+894: len=758
+895: len=758
+896: len=758
+897: len=758
+898: len=758
+899: len=758
+900: len=758
+901: len=758
+902: len=758
+903: len=758
+904: len=758
+905: len=758
+906: len=758
+907: len=758
+908: len=758
+909: len=758
+910: len=758
+911: len=758
+912: len=758
+913: len=758
+914: len=758
+915: len=758
+916: len=758
+917: len=758
+918: len=758
+919: len=758
+920: len=758
+921: len=758
+922: len=758
+923: len=758
+924: len=758
+925: len=758
+926: len=758
+927: len=758
+928: len=758
+929: len=758
+930: len=758
+931: len=758
+932: len=758
+933: len=758
+934: len=758
+935: len=758
+936: len=758
+937: len=758
+938: len=758
+939: len=758
+940: len=758
+941: len=758
+942: len=758
+943: len=758
+944: len=758
+945: len=758
+946: len=758
+947: len=758
+948: len=758
+949: len=758
+950: len=758
+951: len=758
+952: len=758
+953: len=758
+954: len=758
+955: len=758
+956: len=758
+957: len=758
+958: len=758
+959: len=758
+960: len=758
+961: len=758
+962: len=758
+963: len=758
+964: len=758
+965: len=758
+966: len=758
+967: len=758
+968: len=758
+969: len=758
+970: len=758
+971: len=758
+972: len=758
+973: len=758
+974: len=758
+975: len=758
+976: len=758
+977: len=758
+978: len=758
+979: len=758
+980: len=758
+981: len=758
+982: len=758
+983: len=758
+984: len=758
+985: len=758
+986: len=758
+987: len=758
+988: len=758
+989: len=758
+990: len=758
+991: len=758
+992: len=758
+993: len=758
+994: len=758
+995: len=758
+996: len=758
+997: len=758
+998: len=758
+999: len=758
+1000: len=758
+1001: len=758
+1002: len=758
+1003: len=758
+1004: len=758
+1005: len=758
+1006: len=758
+1007: len=758
+1008: len=758
+1009: len=758
+1010: len=758
+1011: len=758
+1012: len=758
+1013: len=758
+1014: len=758
+1015: len=758
+1016: len=758
+1017: len=758
+1018: len=758
+1019: len=758
+1020: len=758
+1021: len=758
+1022: len=758
+1023: len=758
+1024: len=758
+1025: len=758
+1026: len=758
+1027: len=758
+1028: len=758
+1029: len=758
+1030: len=758
+1031: len=758
+1032: len=758
+1033: len=758
+1034: len=758
+1035: len=758
+1036: len=758
+1037: len=758
+1038: len=758
+1039: len=758
+1040: len=758
+1041: len=758
+1042: len=758
+1043: len=758
+1044: len=758
+1045: len=758
+1046: len=758
+1047: len=758
+1048: len=758
+1049: len=758
+1050: len=758
+1051: len=758
+1052: len=758
+1053: len=758
+1054: len=758
+1055: len=758
+1056: len=758
+1057: len=758
+1058: len=758
+1059: len=758
+1060: len=758
+1061: len=758
+1062: len=758
+1063: len=758
+1064: len=758
+1065: len=758
+1066: len=758
+1067: len=758
+1068: len=758
+1069: len=758
+1070: len=758
+1071: len=758
+1072: len=758
+1073: len=758
+1074: len=758
diff --git a/main/snprintf.c b/main/snprintf.c
index 62b73587c0e..f082115c676 100644
--- a/main/snprintf.c
+++ b/main/snprintf.c
@@ -582,10 +582,6 @@ static size_t format_converter(buffy * odp, const char *fmt, va_list ap) /* {{{
 							precision = 0;
 					} else
 						precision = 0;
-
-					if (precision > FORMAT_CONV_MAX_PRECISION) {
-						precision = FORMAT_CONV_MAX_PRECISION;
-					}
 				} else
 					adjust_precision = false;
 			} else
diff --git a/main/snprintf.h b/main/snprintf.h
index d4140c8cee1..2ff7116c3fb 100644
--- a/main/snprintf.h
+++ b/main/snprintf.h
@@ -133,15 +133,4 @@ PHPAPI char * ap_php_conv_10(int64_t num, bool is_unsigned,
 PHPAPI char * ap_php_conv_p2(uint64_t num, int nbits,
 		 char format, char *buf_end, size_t *len);
 
-/* The maximum precision that's allowed for float conversion. Does not include
- * decimal separator, exponent, sign, terminator. Currently does not affect
- * the modes e/f, only g/k/H, as those have a different limit enforced at
- * another level (see NDIG in php_conv_fp()).
- * Applies to the formatting functions of both spprintf.c and snprintf.c, which
- * use equally sized buffers of MAX_BUF_SIZE = 512 to hold the result of the
- * call to zend_gcvt().
- * This should be reasonably smaller than MAX_BUF_SIZE (I think MAX_BUF_SIZE - 9
- * should be enough, but let's give some more space) */
-#define FORMAT_CONV_MAX_PRECISION 500
-
 #endif /* SNPRINTF_H */
diff --git a/main/spprintf.c b/main/spprintf.c
index deb57e93f3d..4c01347fcf4 100644
--- a/main/spprintf.c
+++ b/main/spprintf.c
@@ -289,10 +289,6 @@ static void xbuf_format_converter(void *xbuf, bool is_char, const char *fmt, va_
 							precision = -1;
 					} else
 						precision = 0;
-
-					if (precision > FORMAT_CONV_MAX_PRECISION) {
-						precision = FORMAT_CONV_MAX_PRECISION;
-					}
 				} else
 					adjust_precision = false;
 			} else