Revert "Convert pop_t1 to standard format"

I didn't actually check if this works and right now I don't care
enough to debug why it doesn't; revert for now and I'll fix it later.

This reverts commit fa49626ac2eabb0ce5c313eae81c1b57782d1965.