removed changes in Admin Module (reverse-merged from commit 0ec69ac6595616e0b404b96a5d83bf9225faa620)