Forked upstream for new composer package.