issue #23266: undo temp code