With patches applied, revert to multiple-select#master