My latest commit should do it.