Removed code that snuck in during merge.