Revert commit d38d65d087d3a6434bbcd4a162cd54a2c86cab84

Arguments were not being handled properly.