Revert Bug 1069970 due to broken admin