Need to preserve constructor as otherwise it's API breakage.