Rebuild for #12.