Missing stuff from 6cd753e1c2ad16b74451c8404ef3e77baf3fb05f.