Fix incorrect merge in b05590e3f6acc3d358652179d70f97c13698628a