Revert "Add fast finish"

This reverts commit 5aedac587ba1118d2b02dcdc0cebe4091f325dd8.