Merge "Revert "Deprecate"" into jb-dev