fix x86 image build order (fixes #3317)