Temporarily commented out so build would work while I migrate to the new SDK