Add gross dependencies back for now