Use magic to ensure we're always using the container in \Drupal and not something stored on the test
Closes #2066993