This reverts commit 0dbc363f. Reason for revert: marlin running out of space Change-Id: I80218af6408812b639b7c807bf8cb2a1d5239d94