Prime opportunity to do this in Greenwich

Comment From: OlgaMaciaszek

As it's a backwards incompatible change, it will have to wait till 3.0.

Comment From: OlgaMaciaszek

Done with 3.0. Setting project to Kilburn to remove any new deprecations.