Repro for gh-1573