Restored support for MW < 1.23

Fix for the poorly-thought-out Iaed4fae9d03c2301691be4bccf0a29b816142660

Change-Id: I285c0335c582882b5297a0506260ba97d45e76da