Revert "See if we can run with the vanilla system.properties file too"

This reverts commit 8d84c87c58cf09b0a19c9b1cca986fda79586e04.
No luck, bring back system.properties, add back in some values too