Revert "modularize - Fixed poor array usage."

This has broken buildbots for a few hours.