Revert "Ondeamand/Interactive gov update from maxwen"

This reverts commit 34b9ed23a470027855091b8295e37b0303392e83.