Revert "Replace adpacks with W&W"

This reverts commit 01131166eea296cc65ba60d6200f723c5517a0b2.