Re #8882. Don't hard code the architecture into the path.