Done! See commit e868105