I had the same problem. It may have been drawing air in from the 'T' piece area on the fuel filter. I replaced the hose clamps, fuel filter and 'T' piece seals. I still see a couple of air bubbles in there occasionally but it is nowhere near as bad.
I say 'may' as I replaced the battery at around the same time. The old one was getting weak and the replacement significantly increased the cranking speed.