Revert "Fixes for RECOVERY_VARIANT"

This reverts commit a63708215a0a1ef4ee7e5294c30fdfc8a1d031ed.