Restore some stock code for stability