Revert to Tool Window API