Regression from #1333. 