cleanup: changes related to renewal thread are reverted.