I was recently pinged about PR35276.  It's an old issue, but a couple of 
the concerns raised there haven't been fixed yet, so I've checked in 
this patch to fill in the gaps.

-Sandra