Fix bad removed code