Merge "Revert "Deprecate WpsInfo""