Revert "modify-prepare back"

This reverts commit 542601c92ec0643c208cc206735b33732ba5d611.