Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117e