Oops. Restore deprecated methods I removed too early.