This reverts commit e6d3a9849c96201681915944947a0e5452619929, reversing changes made to d3afe34b51e7588984cc21a2f48da116645e52e3. Signed-off-by: cyli <cyli@twistedmatrix.com> Upstream-commit: dd33d18045e50a198d3d75db8fba12f126e93937 Component: engine