Revert "system_property"

This reverts commit b14724de6e056746fae1c7e3ce39ecc0aaf31768.