Revert "unified space mod"

This reverts commit ed152942f8e764ead777547c2b75e447342b3468.

Change-Id: I682f9c7943ab1da4fc17e9b4759fc678894f047d