The refactoring I've already submitted negates the need for this.