Take 3 on getting Travis build to pass.