I watched parts of Andy vs Andujar match and none of last night's match.
You are right about one thing Anikh. Since Andy's natural game is not that of an aggressive one, after a long break, it takes him time to make that passive to aggressive transition again. This is only due to lack of confidence - at least initially. But this is actually a very common problem for all the aggressive players as well, but the difference is, they stay aggressive regardless even when they lack confidence, because it's their natural style. However, they make a ton of errors while trying to build the confidence back into the game. Now one can say, passive game is not all that attractive but I find an aggressive game that is very prone to errors is just as much unattractive.