Undid a couple of the unused method deletions from commit
667022cca41d10dc498d94c0120f0fd68974b0d1.