Fix: arch-specific setting was leaking through to the slave build.