Merge "Revert "Remove deprecated methods / classes"" into nyc-dev
am: fe01ea05dd

* commit 'fe01ea05dd196acaf95a61e169f6b75654ae0875':
  Revert "Remove deprecated methods / classes"