This reverts commit c108ad5617, reversing changes made to 485f76b835. (cherry picked from commit 22faa52629)
c108ad5617
485f76b835
22faa52629
panic_in_cleanup