Revert AD support