I am in this position and just gave up on trying to resolve... :(