Backout reland amd