Oops, fix up my previous commit properly.