Broken during my conversion to new-style UNO in
commit 28e3aff5.
Also revert mmeeks workaround in
commit c0b78901.

Change-Id: I1f711bbe19556f1bde7699295ca4f56cff54ddb9