Backport CustomAction.pm fix to 3.0.0.4