Revert "Remove state conversion for PACA"

This reverts commit fb281e43ca63ae61f0c68f0e3e0c57af91abbd64.
At the end, no.