Bug 1027707 - Proper backout of reland amd