@jshakespear thanks for updating this, please remove these comments now as they're unneeded and we'll get this in.

Thanks!