I assume this comment change is from the experiment you did with module contexts? You should probably revert this comment.