PIM-2440: Reorder methods