Revert "Merge pull request #465 from Gama11/StartupSize"

This reverts commit 0ac3f3c63fd195d20f9a8891ce3b1f503ad19378, reversing
changes made to aeef5765ef93d6b076d653fb4d3f16fad8f79c78.