Finish r88768, *ahem*