See if commenting out upgrade fixes build