Undid some changes for ADS support that were failing