Undo some changes from !248 that are no longer needed

13 jobs for random-vectorization in 69 minutes and 44 seconds (queued for 5 minutes and 43 seconds)