Also, git cherry-pick failed badly on me... so in order to avoid spending more time than I should I just reproduced your commit @radar, hope it's ok.