Restore compatibility with MW 1.20 and 1.19

Partly reverts I8e420f0259ef6c9e579f7a00beb58f28af9da37d (untested)

Change-Id: Ib8634a3178a626f50f1150661842c16dc26c9516
Merge "Restore compatibility with MW 1.20 and 1.19"