Revert "Remove WAI"

This reverts commit 19b9e937f0fa0d94c927518ff8b6b42eb1f1d97b.