Backed out from autopep8, which broke both files