Temporary changes to work around upstream issue.