Whoops... deleted unnecessary stuff.  Revert "Somehow left trash from merging in file"

This reverts commit 499b6efd56408bed238f8e7bed6214e6fab2ba1a.