Once we decide to merge the new guard code, there's no real point in keeping the old code around, since it's pretty thoroughly deprecated.