Addressed in e5e9a7f