Port away from deprecated methods

REVIEW:120312