Revert "Deduplicate code: Move fallback action into method."

This reverts commit ad33772f56f74406fc66335caef0b673e832d009.
Don't repeat fallback stuff, just raise.