Revert "OBMFULL-6097 Do like 6081 for occurences"

This reverts commit dd4cbbfc3f094d92cccb710a7e67807eedb671f3.