Revert WAI from 2.2.0 to 2.1.4