d3096819 changed constructor signature. Add a backward-compatible one (cherry picked from commit cdee827d)