Unrelated changes removed.