Removed previous modularization prototype.
Authored by: michaz 2014-11-12
Parent: [r31008]
Child: [r31010]