Changed my mind on this one and closed off PR #2967.