This is basically the same as #705181a992.