Revert WPSClient module calling changes