Back-out these until 2.1 gets dones
Always initialize the error value here to not loop indefinitely on same error