Fix: Regression, so introduce option to restore old behaviour.