Restore code that was commented out for debug.