Revert "INI cleanup"

This reverts commit beabb80fbfa40c02f080c97072e58c58702c73e7.