Reverted changes that occurred due to merge with player color.