Maybe?

[tizmagik]

I'm not sure if this is actually correct -- dunno if I completely trust the test yet. I think I need to play around with this more.

I'll be mostly out the next couple days and might not get back to this until next week, so I thought I'd throw it your way in case it's at all helpful @staylor

NOTE: This PR is not into master.