Merge "Remove redundant socket rules."