Back to not doing anything special for the composer