Merge "Revert "Fix a checker test""