fixup! Remove unnecessary builder.