This reverts commit 6578356a4e3e6acd7983c74feab43ac96925894c. The patch had no effect due to a silly mistake and fixing the mistake causes other problems.
This reverts commit 6578356a4e3e6acd7983c74feab43ac96925894c. The patch had no effect due to a silly mistake and fixing the mistake causes other problems.