Revert "revert to previous systemsetting.java"

This reverts commit 2232c439bacb8acf2496c0c637a3d560e98b7f0a.