Raplace "with" by the old "new Builder"

Change-Id: I814b6c5019c6c3606d023d4ef23e80187c190354