Revert "Generate extra userdata partition if needed"

This reverts commit e18d09c1395e0bfe8bcea3341972129a5af24009.