Revert "error with fallback and source code issue"

This reverts commit d352c7d88f585c4132b6d64ea860054d96a8251e.