Reapply r146481 with a fix to create the Builder value in the correct place and