Fantastic; that was exactly the problem. I had unwittingly undone that bugfix during my rebase merges. Thanks for the tip; it would've taken me a while to find that on my own.