Pull out insight method change

Breaking out this refactor from the insight in #1913