Comment 17 for bug 1794292

Reopening per comment #14