Revert "Merge branch 'update-fallback' into add-parameters"

This reverts commit 910f03a55cb3640fba69622fe53f74377fed209d, reversing
changes made to 304d7f3bfc5d56d1bb7470f7df015e39718fa627.

I realized we don't want this merged in here, it'll make things harder to
merge into master later.