#673402 v2.5.1 regression w/shell functions as commands