Revert breaking fix