added flag to emulate legacy behaviour on demand, fixes #1863