Finish commit 8745c70d by Michael Adam.