Try a different approach to the problem in #5117