Revert "Merge branch 'jg/status-config'"