Comment 9 for bug 1733212

Reviewed now and merged.

BTW you can open up merge requests any time, even if you're unsure if the code is correct - it's an easy way to discuss the code. And you've been providing good code anyway :)