Temporary workaround for upgrades