Fix failing build due to upstream changes.