Fixed changes done by my destructive commits.