Revert "Last minute surprise" for now