revert of 00674fe

merge 00674fe breaks iphone compatibly. This is a revert, which also merge revert conflict since collections right management changed a bit meanwhile.