am dd46ad41: (-s ours) Clean up full config - DO NOT MERGE