Fix a module loader regression.

Merge fail when bringing in the jvm-support branch.