Revert "Merge pull request #301 from c-parsons/modulelistfile"
Revert "Merge pull request #301 from c-parsons/modulelistfile"

This reverts commit 1160e9826f9044e95d11d2b1b5a39de79269ba6a, reversing
changes made to 3a153ecc7f67af90e3bab71cc90afd3397546bfa.

danw/blueprint,google/blueprint,google/blueprint,danw/blueprint