Shuffle some commands back to before_install