Delay removal of deprecated methods to fix the build