Revert "Use sandbox_t instead of sandbox_x_t."

This reverts commit 0de50be67a6c0553f1c3638a8d7c8692a3d4c617.