This reverts commit 30376403, and puts the fallback enabling in the correct place
@sitter
BUG: 459253