Follow up to r47976 (bug 17722). For real this time: fix the regression where users...