Revert "Fix issue #561 (bogus "Invalid Param name" error)"

This reverts commit e3dbd7367c40d72e036dd3b9709d897ed61a9606.