Completely revert p2-admin to old revision, too much errors to fix...