Revert "Merge pull request #2256 from 9rnsr/fix_imports"

# PLEASE DO NOT MERGE BEFORE CONSENSUS HAS BEEN REACHED

@9rnsr please advise how we can merge subsets of your work without adversely impacting current code. Thanks!

This reverts commit 6cf399220142a05aba69be2f1ed489496a625aff, reversing
changes made to dea20e73f78649102b4a7945e976198dd8a5c51f.

Conflicts:
	src/dsymbol.c
	src/expression.c
	src/import.c