Revert "Temporary fix for recovery"

This reverts commit 6e156b7c2802e638ee3601c7b1bbd41504b653af.