I think somebody else noted it, but
the key to doing this fix is loosening the bolt for the lower chain roller. That bolt holds the kickstand bracket, loosening it allows you to get a straight-in line on the bolt.
The bolt securing my kickstand was srtipped on my brand new bike when I removed it. First time I've ever pulled out a stripped bolt from the factory on a brand new bike!
Easy to see how it happened though, given the awkward design. Ran a tap through it and figured out that loosening the lower chain roller made the entire job reasonable.
Some pics:
Oh ya, don't attempt this fix without a good spring puller on hand.