This API change still needs to be addressed.