Turns out, this "fix" I made a little while ago was wrong...