Could we extend this strategy to all the changed files? Doing so would avoid those try-except blocks and may also clarify why the imports are wrapped up like this at all...