Appease the pylint gods; back-out unrelated changes.