[ALOY-1060] Remove depdendency on is