and now using the helper (bug 991581)