Switch back to packaging branch. Add admin_email