...broken with 60d60caf "Renamed XPropertySet2
to XPropertySetOption" et al

Change-Id: I684736ffafc4642548b7c24171cc52c1acb32252