Revert to dev prior to Overview GUI merge 88f591a2f0