Revert previous breaking commits