Restore some functionality removed by rector

8 jobs for task/add-rector-test in 2 minutes and 41 seconds (queued for 3 seconds)