Actually fixes what the previous commit purported to fix. :)