It seems like this is correct. Eventually, we should switch over to the new API.