Revert to using system-properties for EMC