Take 2 on getting Travis build to pass.