This works now, apparently... According to SS and their PRs that were accepted into composer - so we should keep it