Revert "missed a conflict"

This reverts commit adbb6cee7e637f786d57e8f2d296f5fe1375a21f.