move from my fork back to doug's go-flymake