This reverts commit 0e0e3ea3.

and fixes the call to o3tl::sorted_vector::erase that causes a crash.

Change-Id: Ic8ef07eb045a63dc8eaaa33886895f1d8f73098c
Reviewed-on: https://gerrit.libreoffice.org/30715Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>