Fixed up to use the 4.4.0 API.