Revert "Import fix, examples work from cli, requirements fix."

This reverts commit d8a32a7624b276bdb533aa4d203a2dda243de97e.