Patch reverted overwritten patch from Min.