Deprecated methods calling deprecated methods was causing
warnings. Disabled until we remove the deprecated methods.