This reverts commit f341b9ba9a5ff6f8b206a1467c16c941b2c00902.

Also enable the faster Travis container-based architecture.