Temporary fix for breaking changes