Properly deprecate method since it now does not what callers expect

Change-Id: I42330f69d0fca2ef425ea7c8bf4ce80f28ca7b30
Merge "Properly deprecate method since it now does not what callers expect"