partial revert of:
commit e8833d4d
Author: Caolán McNamara <caolanm@redhat.com>
Date:   Mon Jan 21 09:33:04 2019 +0000

because of the concerns of https://gerrit.libreoffice.org/#/c/66665/ i.e.
"this looks like it reintroduces the bug fixed in
 471212d4"

but continue to erase the final entry by its known index, rather than force a
lookup of the index of the final entry

Change-Id: Ic14aa133779b5555e8856d6c8fefe4e9b854e2fa