Merge "Change code to use new method"