Addressed in 5271e6a