I believe I removed this code in my PR, so this will cause a merge conflict. This is just more of a note to myself.