some revert
close #54
to #18