Revert "Revert "e610:recovery: fix build""

This reverts commit 2a176a1a23bcf5c9945d09b97e3f094523d42712.