#17 Revert breaking code