Backed out changeset df861b1d04ad -- Isn't enough to support AMD.