More reverts for 'allowmultiple'

Change-Id: I8a1230d3c065b9ca287affabeb8a9c6ec3fa7f75