Perhaps the suggestion in https://github.com/apache/netbeans/issues/3743#issuecomment-1064554938, if implemented in NetBeans and released, would suffice to let us revert most of #324.