No experience with this scenario, but have you checked whether it is a fuel or ignition issue? Pull a plug and see if it's wet or dry. If dry, it's a fuel issue, if wet, ignition (or timing, indeed). Since you put it back to where it ran ok before, it should be something relatively simple, I...