Revert "Enable who drops to normal Users"

This reverts commit 82781e38a69d534c6831a660b7bac55a3b732d74.