Addressed in 3558826