Removed all references to using the
Thread.getCurrentThread.getContextClassLoader()

  Except one, because that's its entire purpose...