Backout the nat46_dev addition, couple of other small cleanups