Revert some changes & change the system size

Change-Id: I4d8f5df4e591d17300dcad0dd6a79a7aca89a6e4