One week on from his quarter-final defeat to Alexander Zverev in Madrid, Rafael Nadal exacted his revenge.