This reverts commit 95b91a04. Given the problems associated with this patch and the others intended to fix the smart_rename CVE, the decision has been taken to$