revert the "stop here" split spec approach

Change-Id: I6ca69e93953c4bb82d6730a785704a52393a0f5d