Revert "Revert "Fix a system data read bug""

This reverts commit 0448ad859ce1f777440f931f63129b7149daebc0.