selectively rather than always. This stops the incorrect "building for: " value. Reported by: redports, danfe