Revert "Switch to trampolined partition function"

This reverts commit acc90cb835708cf319cdca711d84e57fb5dcfe1e.