766a9a9d8f
Some code got committed to stable branches that relied on a new API that was in master only. This fixes it to use the old API.