Apparently MW 1.17 is no longer supported by this code - removed support further

Change-Id: I53d6a7956346a7f3360869bd17b84a59080f468b