It looks like there is no need in `prefinish` after this change