073772ad60
was added without functionality by accident in a7aa3fd. This commit adds
the functionality in. Probably some other fixes too.