And remove the expanduser calls from the action_plugin