Revert "Refactor - make file fallback more obvious" - travis doesn't
like this

This reverts commit 1747a29d63e3c4b299f38d58f7524b79a002325e.