Revert bdb9383..58176fd

This rolls back to commit bdb93832cce72d5f06394a303825f952f93c3c15.
change process logic