Part of changes for new CFG_* options.
Revert "Part of changes for new CFG_* options."

This reverts commit 851fb03c3c29757955cc660186ccd4fc5c03bf70.
Added .gitignore