Oops - part 2 of that commit >_>