rDCS2cbd962e6777

Revert "Merge pull request #137 from Aiko-IT-Systems/file-scoped-namespaces"

This reverts commit 7da774689e473d6d2f59f5318626df48ed880bf1, reversing
changes made to 393d7e70da25b4c9ee2d7ee93256759e10d86f7e.