Revert "Solve WPA dependences"

This reverts commit 03d09c733a9fc7c8260f1f60b609de2ae95f674d.