Fixes #8540 Now, I'm off to buy some J&J stock ... the parent company of a popular eye care product! 😣