Back to pre-Olivier-version