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