Issue #2541304 by Dave Reid: Fixed errors in cases where redirect_update_7101() needs to run more than once.