Revert "Revert "Some governor stuff I missed.""

Something else is screwy with the build and it isn't this.
This goes back where it belongs.

This reverts commit d2cf1a9da11c3a6fbfeaeba4ec5a1ea4ed23b693.