Revert "Bug 18179: Update existing calls"