Shouldn't this still be here?  You want to avoid this code regardless?