Did you restore the code or write new code? I think the prior. The patch looks sane enough without me looking into it deeply, especially so if we're reverting code to it's working state. +1 from me. Push it! (Btw I like comparisons against 3.5.10, because that way we can keep ourselves in check)
Yes, only restore. No new code.
Thanks!
Darrell