Removed AM2.  Should be safe to merge with upstream now.