Created by: camdencheek
This is a merge issue. It's currently breaking main.
Covered by tests. Just fixing a bad merge.