Fix require order issues. Switching to cumbersome until a better solution.