This is series of supplement-ification (Bug 78440). This might make less sense because POINTER_LOCK ifdefs are spreading intrusive way. We could just WONTFIX this once it becomes clearly infeasible to do this.