First pass for #1568