This tries to preserve maemo-x86 compatibilty, if anyone cares.
However, this probably breaks N8x0 support if it ever worked(?).
(cherry picked from commit 3c6c622c)