Bug 1048392 - remove workaround for travis CI failures