Revert "Bringing WAI up to the current test branch."

This reverts commit e0e39007c44b0f07ecb9b3624534847cbac87a6b.