Commend out overrides during upgrade process