will this block even be reached anymore?  If not, go ahead and revert this code too.