Revert breaking commits