Bug 1027707 - Reland amd