Revert "Improve fallback behavior"

This reverts commit 999b196d3e4c3e55f06be81302d25ec8f14350fe.