Legacy compatibility with Julien's code