We want to avoid using the setup method when possible as it is broken and makes three useless API calls. LEARNER-2188
