Addressed in d812e2f