Revert: tun as modules