APP-886 back out registry augmentation for now