See patch. This is what I had to do to get the combo working again.