Olympus seems to have strange focus distances

This hopefully fixes #9807 for real now.
(cherry picked from commit 743ffffb5c9f1ab64ef7c8f0098157e2ab43b2b4)