Attempt separation of config gears.#1474