Now that I think about it, maybe this stopped working correctly when we upgraded from 17.2 to 17.4 client, but who knows?