Correcting history and reverting a previous commit