Travix fix attempt 3
Revert "Travix fix attempt 3"

This reverts commit 45f0603be28d6f3c19a54ef469804be21cc10f86.
Commented factories
Revert "Travis fix attempt #2"

This reverts commit bd041ce8089446e920378bde2db7fcf49fb84836.
merge