This should have been part of the previous commit...darnit!