[FABRIC-715] Remove dependency on system properties