Revert "Travix fix attempt 3"

This reverts commit 45f0603be28d6f3c19a54ef469804be21cc10f86.
Commented factories