Revert beb74a1..3b5a0ec

This rolls back to commit beb74a16298841952d7bece5c44d5ce82f8d78f2.
Base 2.5 admin area