am: 4f858aaa5a
* commit '4f858aaa5a7ef493e79e6d35a8d526f5d8de97e9':
Revert "Revert "Remove deprecated methods / classes""
am: 4f858aaa5a
* commit '4f858aaa5a7ef493e79e6d35a8d526f5d8de97e9':
Revert "Revert "Remove deprecated methods / classes""