Revert "Generate extra userdata partition if needed"

This reverts commit b758e2851fcfb6ce7bdaf4148c4fa51f365caa09.