Switching away from getInstance()