Removed useless clause
(cherry picked from commit 6c919d4)
(cherry picked from commit e4c16db)