Merge "Revert "New failure due to a junit/vogar difference.""