#3314 Seemed to be worked on, but is not marked as solved.