Revert "Merging origin/gtorres/master-pending-cleanup into master"

This reverts commit bda3b77c9cf18d66f9e663bcac9e56c95dee4d9d, reversing
changes made to 76e8989ae36b26a2535564ef75a49badd8178acd.
Revert "Merging origin/gtorres/master-pending-libtest2 into master"

This reverts commit dd5fe869e2326c7221b77c63e0e0c9800604ed05, reversing
changes made to fe31403cffe6e08c2205eafbefe4d77651fe1ddb.
Merging origin/bob/master-pending/revert-library-changes into master