rollback for #634 , reopen #634