Issue #5983: remove getInstance