Fixing due build post-mainline merge