I am not following. If I do this then it will break what this pr is intended to fix.