Revert some thesis-specific modifications