Fix post-merge compile fail in DIST branch.