Clean up github history, revert messy pull request

One bug per commit message, please.