Revert "Merge branch 'determine-partitions-improvements'"

This reverts commit 7ad228ceb580f9ca757e91b019bd8931f710f87a, reversing
changes made to 9c55e2b7794d37cd8713bbc0465aaad23e23472d.