This reverts commit f369d518. The bug this fixes was already fixed by 1c5a0cb1 with the same approach and this commit is now just giving the variable a second fallback value.