Revert "Fix 2ndstage support"

This reverts commit 915f37cad1cb31212b6c624776326b330727a54d.
Revert "Add temporary 2ndstage support"

This reverts commit 17ccc6cabf3c9d0980cb480d0c0e37d7f9fa0c4c.