Revert "Combiner rewrite WIP & more"

This reverts commit 4a12dc3f48269a5e0bacad6ae229442c9f5f5c19.