Unreviewed GTK gardening. Partially revert r224460.