I agree with @crdlc, using a different method is better than overloading the existing one.
@ranbena Can we land Christian's changes before the appIndex removal? His branch should fix bug 919555.