I never saw a patch to address this... also I'm concerned that the change breaks tests and might be out of scope for what I'm doing now.  Thoughts?