Issue #5600: Restore code