Issue #3115153 by lauriii: Follow-up to #3113608: Bartik template incorrectly referencing Claro library (cherry picked from commit 02d5e653)