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