Reverting some AT specific changes