Pulled some cruft from previous commits