Fix bad merge
(cherry picked from commit 19742830747e79b7d5c7b173875ced1a219803ca)