Reverting a few commits