Restore commented code for fix and check if Travis still fails.