Revert "[TASK] Optimize Travis build matrix"

This reverts commit 69be0408fcb54e504c9e5cf7932c7d11e7c6e2c7.