No redesign needed; what we plan to do here is delete this KCM and move its various bits into more appropriate places, but that's a longer-term thing. Closing.