Revert full path imports

For some reasons if it seems to work for some import, these two break
fedocal.