Done in commit b0326913a4f3953a9c4a7c27c578ef46eac8a876

Thanks!