[ALOY-1060] Remove depdendency on is
Merge pull request #463 from skypanther/ALOY-1060

[ALOY-1060] Remove depdendency on is