Back on the git merry-go-round of pain