Bug 915156 - convert modules to node.

DO NOT MERGE