* commit 'b02b8369c6549417561e2ae1467b615645b5d04c': Remove a workaround for the data inconsistency of SystemProperties