Fix builder from being over-aggressive on ${} Upstream-commit: 95b67895c4a5bfa604cf850d202ecb2b4a7f3f14 Component: engine