Backpedal to older commit and add new config parser.
Backpedal to older commit and add new config parser.