S63565: Removing kludge needed to keep tests happy while changing appsdk