Patch Set 1:

I forgot how stupid Git/Gerrit is.. the result is correct but the steps I took to get there aren't so I have to rewrite history. I'll rewrite the fix from scratch. New patch coming soon.