Commented out bad code caused by merge.