Even after that fix was merged, stuff is still broken: 