am 4179e889: Merge "Revert "Collapse code paths for single- and multi-input kernels.""

* commit '4179e88963456946fe6e580f2211341cc8ccba5c':
  Revert "Collapse code paths for single- and multi-input kernels."