Use prelude-require-packages everywhere
Pull in upstream changes