Um, see previous commit message, doh!