The changes here with removing the `generate_*` stuff is what I didn't want to review in this patch, can bit be removed?