revert changes for issue 23832