Kick i586 outa here
Merge pull request #1 from Knewton/t/grrr-1586

Kick i586 outa here