[FaceRest] Revert efe05ef3.

Sorry, now I noticed that it's too ugly commit...
I'll retry to refine HandlerArg related code.