Originally for LibChrist
