[Bug 1387924] Rebuild including C version