Revert "Attempted fix for the Travis CI failure that we is CNR locally"

This reverts commit 990b37fe784b0fba2dc32ae8f54610afba9f7bb6.