init: switch to internal swap handling

Change-Id: I8ea9dc0635e462cebba57cb0b50ad69d3244db2d