Switch to use the refactored RaveTask