Some refacotring code makes this patch obsolete.  Here is the new one.

-- 
Yao (齐尧)