Fix build on 8.4-i386