879d35d6fb
Instead of introducing a new decorator to temporarily change the configuration, use the existing infrastructure. Furthermore, avoid passing the model name in some calls since it's implied already.
879d35d6fb