Fixup previous commit, which was sadly botched.