Merge "Remove a problematic empty update optimization."