* re-commit r58172 with the fix for the issue mentioned where users would not be...