Don't use @importFrom. Closes #353