I just did mine (two days ago) it should work. Threads are M8x1. 25.
I know alot of guys say the hammer trick will work - it wouldn't have worked on mine. I tried it, and I was hitting it alot harder than I liked. I just about hit the limit on my puller before it came off.
The other thing to watch - make sure once the gear comes off that you CAREFULLY pull the pump out and make sure that you orient the keyway to 12 oclock before you pull it - and don't snag the key on the way out. My keyway just about popped out when the gear came off - if it wasn't at 12 oclock I would have had to pull the front cover and retrieve a key... .