Repacked fix to preserve original code formatting.