Merge "Revert "GVN final fields even with side effects.""