Revert of previous commit that was an attempt to avoid F811 error on
travis