Hopefully fixes Redmine #140 (ghost dickery in xenoarch)