Merge "Remove misleading todo from config.py"