Revert 33704793c0 until I figure out how intra-module imports are supposed to be done.