Working on something for #1327.