Ensure that environmentdef is overridden by host selection.

cc: zvika.gart