Remove some old pre-bundler code
Undo 'rebundle' commit (00b921e24fd38c4241efe2d270c64527d1bb204f)
Merge pull request #403 from tiegz/undo_rebundle_commit

Undo "rebundle" commit
fix conflicts from merge