Restoring my magit sanity