build: commit 13606bbfde follow-up 1