Addressed in e8a2916