Revert "Remove recovery building"

This reverts commit d8634025297bada1787388ebb1e7b7ff744f525c.