Revert "Testing switching to usr/modules."

This reverts commit 98466e55213b52818f67ebc739a71dc0cd7f8d73.