Partially revert and tune the bigmem patch

Change-Id: I992681c7628265d42815b13a1eedda7bdcf40f16