I'm pretty certain rebuilding the AAG will work. But we are trying to avoid the effort of having to rebuild. I am hoping there is a way to modify behind the scenes.