Revert "Lazy gov edits"

This reverts commit 9e545a9910c1ff46094da81a716d5bcf35dd6cb1.