2w: squash revert of all 2w stuff

Signed-off-by: poondog <markj338@gmail.com>