Restore compatibility with MW 1.20

Change-Id: I2b67cc915db0dbe1a8fe08a4d62bb36608df954e