Revert "Recovery fix"

This reverts commit a3cd56c45ce0ebae60985fa87084a6b3bbcacbd6.