Comment 1 for bug 2041245

I think this needs to be squashed into the recovery patch but I didn't test it: https://gist.github.com/julian-klode/9e64ded494d208f3597cab498177f533

Basically upstream changed the code to initialize things earlier and we just appended to it, so this aligns it with the new upstream approach.