Bring system.ex back to bootstrap. Closes #1155
Merge pull request #1183 from alco/system-bootstrap

Bring system.ex back to bootstrap