The BK merging was a little too smart for the conflicting changes.
Add back what we lost with the last changeset.