Move stuff back to censored lib where it is still generic.