I need to work more on the problem that this commit tried to resolve This reverts commit 84660db9d2.
84660db9d2