I *think* this might be breaking nox-review on Travis (but not here...) Reverting to get Travis working ASAP until I figure out if that is so. This reverts commit ba9a6e2d.