*Correct* request with changes

Geez. 
Sorry fot that mess in the other request, guess I should't try to do those things while sleep deprived for 36 hours.
So anyway, I created a new branch and cherry-picked the relevant commits, so the request is clean (since I don't want to actually rebase anything).

Sorry again, 
Thanks.