Addressed in dd87f7c7