Internal API changes. Attempt to fix known issue.