Reverting breaking GA change