MB-6972:  no need for EDITION

Change-Id: I2c62dbba5d52c38753ee8a6e9b68f885e781d775