Revert "modify to :import-from instead of :: to use internal functions"

This reverts commit b221ae1eb194ad53701cfa4978d825676057bbfd.