I should have done this when Scaffold was rebased (cherry picked from commit 6b1d597d34f903fabfc65ac9cd6bd561fc38f505)