This reverts 5485ef70, which breaks
JunitTest_toolkit_unoapi (toolkit.AccessibleMenu)

Change-Id: Ic9021c23178f1598c08186e5cb24fde13a866579