Revert "Don't force building recovery - fixing a 4.4.3 merge derp"

This reverts commit ffdb1b0261ba56a7da3dfcb53fc7a1590bd389af.