Revert "lxc refactor"

Reverts saltstack/salt#14137