Fix dropped conditional in cleanup in r245752