Adds option to restore old behaviour. Fixes #684