Merge "Revert "Collapse code paths for single- and multi-input kernels.""