Undo undesired change from master.
Fix license headers.