Bugzilla #407789 handle API change gracefully