Reverting merge
merged from release-5-3-1
Restore parameter
Remove orphaned file
Merge pull request #64 from smith750/master

Restore whacked parameter
Merge pull request #63 from kkronenb/master

Reverting merge