Remove redundant return nil Upstream-commit: 1df474a3118907a072ff5ac7a60529f0846a770e Component: engine