Re-enable fast_finish