Reverting module change for now

Will figure out a proper solution to this on another branch.