Roll back to pre-fossa pivot, with cleanup all around.