Issue #2340553 by fgm: Fixed ExecutePHP is broken after #2310411.